From: Alan Mackenzie <acm@muc.de>
Date: Tue, 11 Jan 2022 21:57:54 +0000 (+0000)
Subject: Merge branch 'master' into scratch/correct-warning-pos
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~3291^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2128cd8c08da84ab40608ac5db0fecfce733cfad;p=emacs.git

Merge branch 'master' into scratch/correct-warning-pos
---

2128cd8c08da84ab40608ac5db0fecfce733cfad
diff --cc lisp/emacs-lisp/bytecomp.el
index 47b5d6cecaa,708e6123606..b3197a97021
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@@ -1790,13 -1712,11 +1787,13 @@@ It is too wide if it has any lines long
                            (nth 2 form)))))
        (when (and (consp name) (eq (car name) 'quote))
          (setq name (cadr name)))
-       (setq name (if name (format " `%s'" name) ""))
+       (setq name (if name (format " `%s' " name) ""))
        (when (and kind docs (stringp docs)
                   (byte-compile--wide-docstring-p docs col))
 -        (byte-compile-warn "%s%sdocstring wider than %s characters"
 -                           kind name col))))
 +        (byte-compile-warn-x
 +         name
 +         "%s%s docstring wider than %s characters"
 +         kind name col))))
    form)
  
  ;; If we have compiled any calls to functions which are not known to be
@@@ -2778,19 -2675,8 +2774,10 @@@ list that represents a doc string refer
  (put 'make-obsolete 'byte-hunk-handler 'byte-compile-file-form-make-obsolete)
  (defun byte-compile-file-form-make-obsolete (form)
    (prog1 (byte-compile-keep-pending form)
 -    (apply 'make-obsolete (mapcar 'eval (cdr form)))))
 +    (apply 'make-obsolete
 +           (mapcar 'eval
 +                   (macroexp-strip-symbol-positions (cdr form))))))
  
- ;; This handler is not necessary, but it makes the output from dont-compile
- ;; and similar macros cleaner.
- (put 'eval 'byte-hunk-handler 'byte-compile-file-form-eval)
- (defun byte-compile-file-form-eval (form)
-   (if (and (eq (car-safe (nth 1 form)) 'quote)
-            (equal (nth 2 form) lexical-binding))
-       (nth 1 (nth 1 form))
-     (byte-compile-keep-pending form)))
- 
  (defun byte-compile-file-form-defmumble (name macro arglist body rest)
    "Process a `defalias' for NAME.
  If MACRO is non-nil, the definition is known to be a macro.
diff --cc lisp/emacs-lisp/macroexp.el
index 11204f7f7fb,b44917f7d56..663856a8fb3
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@@ -208,10 -135,13 +208,13 @@@ Other uses risk returning non-nil valu
  
  (defvar macroexp--warned (make-hash-table :test #'equal :weakness 'key))
  
 -(defun macroexp--warn-wrap (msg form category)
 +(defun macroexp--warn-wrap (arg msg form category)
-   (let ((when-compiled (lambda ()
-                          (when (byte-compile-warning-enabled-p category)
-                            (byte-compile-warn-x arg "%s" msg)))))
+   (let ((when-compiled
+ 	 (lambda ()
+            (when (if (consp category)
+                      (apply #'byte-compile-warning-enabled-p category)
+                    (byte-compile-warning-enabled-p category))
 -             (byte-compile-warn "%s" msg)))))
++             (byte-compile-warn-x arg "%s" msg)))))
      `(progn
         (macroexp--funcall-if-compiled ',when-compiled)
         ,form)))
@@@ -398,19 -339,19 +414,20 @@@ Assumes the caller has bound `macroexpa
        (`(,(or 'function 'quote) . ,_) form)
        (`(,(and fun (or 'let 'let*)) . ,(or `(,bindings . ,body)
                                             pcase--dontcare))
-        (macroexp--cons
-         fun
-         (macroexp--cons
-          (macroexp--all-clauses bindings 1)
-          (if (null body)
-              (macroexp-unprogn
-               (macroexp-warn-and-return
-                fun
-                (format "Empty %s body" fun)
-                nil nil 'compile-only))
-            (macroexp--all-forms body))
-          (cdr form))
-         form))
+        (let ((macroexp--dynvars macroexp--dynvars))
+          (macroexp--cons
+           fun
+           (macroexp--cons
+            (macroexp--all-clauses bindings 1)
+            (if (null body)
+                (macroexp-unprogn
+                 (macroexp-warn-and-return
++                 fun
+                  (format "Empty %s body" fun)
+                  nil nil 'compile-only))
+              (macroexp--all-forms body))
+            (cdr form))
+           form)))
        (`(,(and fun `(lambda . ,_)) . ,args)
         ;; Embedded lambda in function position.
         ;; If the byte-optimizer is loaded, try to unfold this,